Merge pull request #3194 from matt335672/v0_10_chansrv_clip_fixes #2099

Job	Run time
code formatting check	15s
cppcheck	17m 45s
min features with gcc	2m 31s
min features with g++	2m 53s
min features with clang	2m 27s
max features with gcc	4m 11s
max features with g++	2m 19s
max features with clang	4m 10s
max features with gcc and DEBUG	2m 1s
max features with gcc for 32-bit arch (legacy OS)	1m 34s
max features with g++ for 32-bit arch (legacy OS)	1m 51s
max features with clang for 32-bit arch (legacy OS)	1m 36s
	43m 33s

Provide feedback