Merge "Return path including executable instead of without"