Merge pull request #3297 from matt335672/waitforx_improvements #2228

Job	Run time
cppcheck	4m 3s
code formatting check	12s
min features with gcc	56m 28s
min features with g++	1h 3m 47s
min features with clang	2m 53s
max features with gcc	1h 3m 13s
max features with g++	2m 25s
max features with clang	3m 49s
max features with clang and AddressSanitized	12m 17s
max features with gcc and DEBUG	2m 46s
max features with gcc for 32-bit arch (legacy OS)	1m 38s
max features with g++ for 32-bit arch (legacy OS)	1m 57s
max features with clang for 32-bit arch (legacy OS)	2m 5s
	3h 37m 33s

Provide feedback