Merge master hotfix into dev#665

ps2 merged 2 commits intodevLoopKit/Loop:devfrom

masterLoopKit/Loop:masterCopy head branch name to clipboard