Sync with 9712f1.