Sync with 59af9e.