Draft: 10.5.x fix only backport

Merge request reports

Loading