NEB-3695: General

Owned by Surfdoq