Sync with 5e5007.