Merge pull request #1046 from fedorcomander/blackbox_inflight_adjustments