Upstream merge from Cube-Space