Merge 2.4.1 into main (UI)

Charlotte Hausman requested to merge release/2.4.1-RC1 into main

Merge request reports