Merge "update scenario scores"