Merge branch 'fix/mediaproxy-empty-url' into 'develop'