Sync with e7fa00.