Sync with 340717.