(ABM-180) setup scenario structure
Merge branch 'wu_feature' into develop