Backport fixes to 7.3

Merge request reports

Loading