manually merged changes to platform/pom.xml by Michael