Merge branch 'hotfix/0.9.11'
remove unexplicable condition in the view
Merge branch 'hotfix/0.9.12' into develop