fix build for sh sheel
Merge branch 'master' into next