BZ-12520: fix for view.
Merge branch 'origin/master'