Fix .sh test
Fix .sh support
Merge branch 'sh-support-fix' into develop