Revert "Merge branch 'winh-merge-request-related-issues' into 'master'"
What does this MR do?
Revert changes from !11759 (merged) because they introduce several regressions.
Revert changes from !11759 (merged) because they introduce several regressions.