Merge patch for MW 1.19.10

@federico-lox