Merge pull request #2971 from jpgough-ms/issue-2970-calm-hub-key-collisions-issues