Fixes #5948 Adds keyring support #5952
+511
−45
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.