Merge branch '4642_fix_overflow' #252

Job	Run time
call-build-macos / build-macos	1m 58s
call-build-alpine / build-alpine	2m 11s
call-build-fedora / build-fedora	2m 8s
call-build-freebsd / build-freebsd	3m 18s
call-build-solaris / build-solaris	5m 58s
call-build-ubuntu / build-ubuntu	4m 35s
	20m 8s

Provide feedback