Merge pull request #3363 from matt335672/fix_qianxin_mem_leak #2326

Job	Run time
cppcheck	4m 7s
min features with gcc	2m 28s
code formatting check	26s
min features with g++	2m 19s
min features with clang	2m 32s
max features with gcc	3m 58s
max features with g++	2m 26s
max features with clang	4m 31s
max features with clang and AddressSanitized	3m 24s
max features with gcc and DEBUG	2m 50s
max features with gcc for 32-bit arch (legacy OS)	2m 27s
max features with g++ for 32-bit arch (legacy OS)	2m 44s
max features with clang for 32-bit arch (legacy OS)	2m 49s
	37m 1s

Provide feedback