Merge "Check number of output buffers and sizes" into lmp-dev