Merge branch '4597_fish_csi' #86

Job	Run time
call-build-alpine / build-alpine	2m 11s
call-build-fedora / build-fedora	1m 56s
call-build-macos / build-macos	1m 50s
call-build-ubuntu / build-ubuntu	4m 9s
call-build-freebsd / build-freebsd	3m 0s
call-build-solaris / build-solaris	5m 26s
	18m 32s

Provide feedback