Merge pull request #2417 from tnull/2023-07-max-total-fee