NEB-3856: Valentino

Owned by Grimfeir