Changed from 'merge' to 'cherry-pick' to facilitate testing.