Merge branch 'changelog/1484-base_url-remove-media' into 'develop'