Merge "pom update"