(CE-515) Merge patch for MW 1.19.9

@owend