Update patch from pull request 320

itdrequested to merge
itd/afew:itd/apply-upstream-pull-request-320 into master

Closes: #1106896

Merge request reports