Merge pull request #3380 from matt335672/fix_mem_leaks #2328

Job	Run time
code formatting check	14s
cppcheck	3m 56s
min features with gcc	2m 39s
min features with g++	2m 36s
min features with clang	2m 18s
max features with gcc	3m 27s
max features with g++	2m 21s
max features with clang	3m 34s
max features with gcc and DEBUG	2m 14s
max features with gcc for 32-bit arch (legacy OS)	1m 40s
max features with g++ for 32-bit arch (legacy OS)	1m 58s
max features with clang for 32-bit arch (legacy OS)	1m 53s
	28m 50s

Provide feedback