[Bug 406173] Update patch for Monsoon