Merge branch 'jk/connect-clear-env' into maint