Fix GetDomain error (#153).
Merge remote-tracking branch 'origin/georchestra-29' into georchestra-29