Backport pom modification from Step0 + update README