rework cherry-pick logic for leo