Merge changes from the 8.1 branch in main #80

Closed nicholasberlin closed 2 years ago