Apply missing MW 1.19.11 changes

Apply missing changes from MW 1.19.11 release so we don't
run into conflicts when applying future patches.

Follow up to 1a86f3d40bb0fc557e126f7b499171f83499a730
Merge branch 'mw-1-19-11' into dev