StepBetween: renamed stuff back to the way it was. Thought I had already done that.
Merge branch 'canStepBetween' into recent