Merge branch 'rs/ring-buffer-wraparound' into maint