am 808723f2: Merge "Cleanup Allocation and add 3D copies." into jb-mr2-dev

* commit '808723f2b8a3842114f064a5ad4ee08fa9698192':
  Cleanup Allocation and add 3D copies.