Added viewport tag
Merge branch 'release/2.0.1'