Still fixing cuboid options.
Merge origin/master