Resolve #3470815 "Improvements"

Closes #3470815

Merge request reports

Loading