Merge branch 'fix-winclose' into dev
Merge branch 'fix-win-path' into dev