fixed scenario parsing and validation
Merge branch 'hotfix/scenario-parsing-and-validation'