Near finalizing of views
Merge origin/kleon/main-interface into kleon/main-interface