Merge pull request #1019 from jkczyz/2021-07-shutdown-pubkey