Merge "Cleanup Allocation and add 3D copies." into jb-mr2-dev