Merge "Minor changes to scenario manager"