Merge branch 'hotfix/view_not_active'