Resolve missing step def
Merge branch 'master' into DS-1008