GUEST-1714: Addiv

Owned by uwss