Sync with 4cae92.