fix merge from '845-ld64-134.9' branch