marketplace settings test fix
marketplace settings
Merge branch 'master' into source_uri_problems