Merge "pom fix"