Cleanup with new branch and patch 257

Closes #2313309

Merge request reports

Loading