MANT-3129: Cinnamon

Owned by Waffle