Merge pull request #1011 from TheBlueMatt/2021-07-new-closing-fee