update base with fix/change to viewport code
Merge pull request #1245 from hwhw/master

update base with fix/change to viewport code