Merge branch 'hotfix/bug_fix'
Fixed Typo
Merge branch 'hotfix/bug_fix' into develop