Catch up with main

Merged Charlotte Hausman requested to merge catch_up_with_main into release/2.4.2-RC1

Merge request reports