APD-434: Disabled second search group
Merge remote-tracking branch 'origin/APD-434' into develop