Merge "Moving all configs from overrides.xml to config.xml" into main