Merge "Fix AllocationAdapter offseting"