Fixup merge of branch 'feature/maven-deployment'