Merge branch 'features/mediatype-mime-valid' into 'develop'