Merge branch 'ph/cherry-pick-advice-refinement' into next