Merge branch 'js/windows-open-eisdir-error' into maint