NEB-3875: Zack

Owned by Grimfeir