Merge branches 'develop' and 'master' into develop
SH is forward not HS.
Update lib
Merge branches 'master' and 'develop'