Resolve #3580828 "Improve consistency with"

Closes #3580828

Merge request reports

Loading