Merge branch 'hotfix/2'
Fixed state issue
Merge branch 'hotfix/3' into develop