Fixes to hanging outstanding flag
Merge remote-tracking branch 'aaron/reconfiguration' into benchmark-controller