Merge branch 'master' into template_vistype