Merge branch 'cp/git-flush-is-an-env-bool' into maint-2.43