NEB-1147: Noel

Owned by Surfdoq