Merge "change scenario owner"