Add fixes to 24a release

Merge request reports

Loading