CONN-258: Move HCID to exchange section.