Resolve #3501938 "Improve code related"

Closes #3501938

Merge request reports

Loading