Merge branch 'hotfix/11st'
Merge branch 'master' of https://github.com/gp6shc/smg