Merge "Fix 3d Allocation support"