Fix wrongly written stepdef
Minor refactor
Minor step refactor
Merge branch 'master' into DS-1008
Remove unused step
Removal of no-op step