Merge pull request #1053 from github/mbaluda/copilot-review

Merge pull request #1053 from github/mbaluda/copilot-review #3588