Merge to U8951 and fix build