view const correctness improved [ci skip]
Merge branch 'view_refactor'