Merge branch 'cleanup/deprecated_config_upload' into 'develop'