Merge pull request #1072 from TheBlueMatt/2021-09-tighter-max_fee-constant