WIP: cleanup, renamed setting to 'master_url_prefix'