Merge pull request #9810 from annando/fixed-view