Code sync to fix build break