Merge "Fixing build break"