Uppercase POM
Merge branch 'develop'