Merge branch 'dl/complete-cherry-pick-revert-skip'