imgpu commit
fixed conflict
imgpu2