Merge "Fix typo in scenario manager"