Merge branch 'ptr_ring-fixes'