Sync with 714c75.