Merge and patch for SHW-M440S