Merge and update patch from M440S update3 and E210K update9