Merge and update diff patch from M440S Update3 open source