Merge branch 'cycles-router-mediaproxy' into 'develop'