Merge view-selection branch updates into master
Merge branch 'master' into view-selection