Merge pull request #8273 from CookiePLMonster/config-threading-fixes Threading fixes for config layers
