Changes from 2.4.4-3.1

I was unable to push the changes directly, so here they are as MR.

Merge request reports

Loading