Merge branch 'gb/maint-submodule-env' into maint