TERRA-2743: Surveillance

Owned by SycnoLogical