Backport fixes for a v8p5r1 release

Merge request reports

Loading