Reverted TCuboidPart to master