fix bad merge
fix RangeTombstoneTest
Merge branch 'offheap1' into offheap2
fix + tweaks