Refactor materialization views and state updating functions.
Merge branch 'master' into develop