Merge branch 'GONRG-5813-Search-Policy-Disable-Option'

Oleksandr Kosse (EPAM)requested to merge
cherry-pick-7a49cef5 into release/0.17

Original MR: !363 (merged)

Edited by David Diederich

Merge request reports