Sync with head @274421.