another flag update (still WIP)
Merge remote-tracking branch 'upstream/master'