Resolve #3251223 "Code improve"

Closes #3251223

Merge request reports

Loading