Merge: First pass at fixing cube issues.
Merge: First pass at fixing cube issues.