Merge "Enable Mapper V5 and Allocator V2" into main