Sync with cd351e.