(CE-689) Apply patch for MW 1.19.13

@federico-lox