Added Max InFlight Messages settings
Merge branch 'production' into TSL_support

* production:
  Added Max InFlight Messages settings