Merge and update diff patch from E210K Update9