Let exec take a Scenario, backport #1145