Merge "ProjectConfig sections refactoring"