Merge change I2022dcd9

* changes:
  Standardized on one single output buffer for all the commands output.