Update Scenario on edit view
Merge branch 'feature/new-scenario-update' into develop