Merge "Add a scenario test gate"