Merge "Update to latest pom version"