Added all proposed changes

Closes #3523497

Merge request reports

Loading