Merge branch 'daniel/gci-connections'