Merge branch 'hotfix/1132'

Close #1132
fixed typo
Merge branch 'hotfix/1134' into develop

Forward port #1134