Merge branch 'align-ring-buffers-with-basop' into 'main'

Back-port changes to ring buffers from BASOP development

See merge request !2355