NEB-3562: Thomas

Owned by Grimfeir