Merge "Refactor linker allocator"