forward port changes for JAVA-969