Sync with 4e5cc6.