Fix dereference error in multiple SV_ roles case
Merge remote-tracking branch 'origin/georchestra-29' into georchestra-29