Merge branch 'feature/application-xml-mime' into 'develop'