Merge "Update for Allocation changes"