Refactor Maven dependencies
Merge branch 'feature-clean-pom' into dev-ced