Merge branch 'ef/maint-win-verify-path'