[WIP] Fix issues based on review feedback for pull request 279#281

ptr727 merged 2 commits into

developptr727/Utilities:developfrom

copilot/sub-pr-279-againptr727/Utilities:copilot/sub-pr-279-againCopy head branch name to clipboard