src/gd update
Merge commit 'refs/top-bases/t/svr/env' into t/svr/env
Merge commit 'refs/top-bases/t/svr/cmcc' into t/svr/cmcc