shebang fix
Merge branch 'release/2.3.7'