Cherry-pick: Merge branch 'GONRG-7273' into 'master'
Change naming SA
See merge request !969 (merged)
(cherry picked from commit 489d93e1)
70022ec4 Change naming
Change naming SA
See merge request !969 (merged)
(cherry picked from commit 489d93e1)
70022ec4 Change naming