Merge pull request #244 from deanurag/main #369

Job	Run time
test-linux-386 / run (linux-386-unit-1-cpu)	37s
test-linux-amd64 / run (linux-amd64-unit-4-cpu-race)	35s
coverage	1m 6s
	2m 18s

Provide feedback