Backport pom modification from Step0