Merge branch 'master' into patch/view_migration