Resolve cherry-pick conflicts
Add missing dash