Merge pull request #2986 from willosborne/fix/calmhub-loader-claims-non-hub-urls