Support for cubic and cylindrical samples

Reference: MG380-01