Merge remote-tracking branch 'origin/master' into dev
Added Flag generation (part 3).
Merge remote-tracking branch 'origin/dev'