Merge branch 'hotfix-1.1.8'
Fixed Static Error
Merge branch 'hotfix-1.1.9' into develop