Merge "Add a new flag for demo"