Fixed previous fix
Merge branch 'feature_cloud_config_file' into temp