Merge branch 'develop' into feat/winget-automation