Sync with cbdd2b.