Merge pull request #976 from TheBlueMatt/2021-06-actionable-errors