Merge pull request #2132 from tnull/2023-03-tx-sync-even-more-robustness