MANT-1039: Tiramisu

Owned by Sharkbee