Differences with the scenario_designer branch merged in the master_clean