back ported MDL-38923