Merge view-selection branch updates into master