Merge branch 'ma/locate-in-path-for-windows'