Merge branch 'master' into setup-install-extension