Merge pull request #819 from TheBlueMatt/2021-03-810-rebased