Merge pull request #817 from fuweid/13-backport-49eb212fa8ab67709ea46… #898

Job	Run time
test-linux (linux-amd64-unit-test-1-cpu)	11m 33s
test-linux (linux-amd64-unit-test-2-cpu)	12m 41s
test-windows (windows-amd64-unit-test-4-cpu)	35m 20s
test-linux (linux-amd64-unit-test-4-cpu)	12m 31s
test-linux (linux-amd64-unit-test-4-cpu-race)	21m 10s
coverage (ubuntu-latest)	13m 15s
coverage (windows-latest)	39m 6s
	2h 25m 36s

Provide feedback