Code rebased to #8491eaa6, add fix for OTG0147112

Merge request reports

Loading