marketplace settings test fix
Merge branch 'master' into modal-errors