Backport of upgrade fixes

Merge request reports

Loading