Generate some extra flags for demo.
Merge remote-tracking branch 'origin/master'