Merge pull request #2957 from metalefty/v0.10-cherry-pick #375

Job	Run time
cppcheck	17m 58s
code formatting check	17s
min features with gcc	3m 41s
min features with g++	2m 23s
min features with clang	2m 5s
max features with gcc	3m 24s
max features with g++	3m 59s
max features with clang	3m 0s
max features with gcc and DEBUG	2m 27s
max features with gcc for 32-bit arch (legacy OS)	1m 30s
max features with g++ for 32-bit arch (legacy OS)	1m 26s
max features with clang for 32-bit arch (legacy OS)	1m 47s
	43m 57s

Provide feedback