Merge branch 'jn/cherry-pick-strategy-option' into next