Removes security view
Merge branch 'master' into HEAD