Merge "pom.xml changes"