initial set of fixes

Closes #3600833

Merge request reports

Loading