POM cleanup
Merge branch 'master' into feature/navigation