Port changes in v38r1-patches to v38r3

Merge request reports

Loading