Sync with dc7dd8.