Merge branch 'fix/mediaproxy-s3' into 'develop'