fix merge issues after merge from 8u242
1 file changed