Merge branch 'fix/mediaproxy-whitelist-base_url' into 'develop'