u8150: merge many other changes