Merge branch 'master' into view-refactor