Change to work with both 'next_step'
Merge branch 'master' into command-line