Merge "allocate2 -> allocateWithOptions" into main