Merge pull request #1356 from thanpolas/new-config-load-sequence

New config load sequence