Backport few fixes in release

Merge request reports

Loading