Correction of uncomplet cherry-pick