Sync with d8cc37.