Merge "Add a reno for scenario manager effort"