Merge "Fix ringbuffer handling" into lmp-dev