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