patch for MDL-44495

This is a patch for MDL-44495