Draft: Resolve #3567871 "Port changes from"

Closes #3567871

Merge request reports

Loading