Merge branch 'generalized-geo-domains' into 'master'

Implement generalized support for geo domains

See merge request !574
2 jobs for master in 36 seconds (queued for 1 second)