Merge pull request #2069 from TheBlueMatt/2023-03-no-tx-sync-auto-std