Merge pull request #2946 from tnull/2024-03-txsync-readd-reorged-output-spends