hotfixes: step creation was blocked, deferred call syntax was wrong
Merge branch 'master' into develop