Merge "Fix for linker allocator"