Merge 'fix-is-exe' into HEAD