Merge 2.8.2 to main

Charlotte Hausmanrequested to merge
2.8.2-DEVELOPMENT into main

Build system has been verified stable enough for non-dev deployment. Merge to main

Merge request reports