Catch up with main 2.8

Charlotte Hausmanrequested to merge
catch_up_with_main_2.8 into 2.8-DEVELPMENT

final catch up before merging 2.8 into main

Edited by Charlotte Hausman

Merge request reports