Manual merge with stock version of u10z