Sync with trunk head (part 1 of 2)