Merge branch 'fix/mediaproxy-config-descriptions' into 'develop'