Add config to enable/disable use of inflight queue