Merge change 22066 into eclair

* changes:
  Add offset handling in MemoryHeapBase class