Sync with bd0172.