comments etc
Merge branch 'offheap1' into marcus-6689