Sync with 86bffb9.