Merge "fix build break"