Merge "update versions under scenario"