Fix for OPA service issue/minor refactoring [GONRG-5212]

Merge request reports

Loading