Shared code path fixes

Merge request reports

Loading