Sync with 9e56b8.