Merge pull request #1531 from ariard/2022-06-fee-sniping