make sure config is also on top level
Merge remote-tracking branch 'remotes/origin/source_extra_config_validation' into source_extra_config_validation