Correct rebase in a hurry
Merge branch 'master' into next
mvvm: Interaction tier architecture
Merge branch 'enhancement/mvvm' into next