[NCuboid] Oops.
Merge branch '1.6'