Follow-up to #2402, should complete #2305#2418

willend merged 1 commit intomccode-dev:mainmccode-dev/McCode:mainfrom

willend:mainwillend/McCode:mainCopy head branch name to clipboard