Resolve #3584427 "Additional changes"

Closes #3584427

Merge request reports

Loading