- incorporate Simo's updated backport of his updated persistent-keyring changes (more of #991148)
- incorporate Simo's backport of his persistent-keyring changes (#991148)