Fix view containment bug
Merge branch 'refs/heads/dev'