Catch up with main 2.8

Charlotte Hausmanrequested to merge
catch_up_with_main_2.8 into 2.8-DEVELPMENT

Now that 2.7 is headed for production, update 2.8 with changes

Edited by Charlotte Hausman

Merge request reports