back port of OC-10380 to 10-stable