fix
Merge branch 'iss-6781' into offheap2c+6781