Revert "Merge branch 'winh-merge-request-related-issues' into 9-3-stable-rc6

See merge request !12321