Commit to merge with mem fix
Merge
Fixed allocation error in AABB creation