Merge "Move allocator-V1 entry"