Merge remote-tracking branch 'origin/master' into develop
WIP more granular flight control
static cleanup