NEB-2675: Sunny

Owned by Surfdoq