Merge branch 'feature/maven-deployment' into 3.0.x