gg-8786 - fixed
gg-8786 - fixed2
Merge branches 'gg-8786' and 'sprint-25-6.2.0' of https://github.com/ggprivate/ggprivate into sprint-25-6.2.0
Minor fix.