Merge "Allocation API update."