integrate fix from MDL-31365