Merge pull request #1486 from TheBlueMatt/2022-05-revoked-txn-edge-cases