CON-2657: Necavi

Owned by Belmoth__