update 2.4 branch with fixes in master branch

Merge request reports

Loading