Merge branch 'refactor/view-models' into 'master'