Scenario Management hot fix