[NCuboid] Additional fixes
Merge branch '1.6'