Merge pull request #856 from TheBlueMatt/2021-03-check-tx