Merge pull request #2725 from div72/diag-fix2 #2863

Job	Run time
Lint	55s
macOS 12 native [GOAL install] [GUI] [no depends]	11m 35s
ARM [GOAL install] [buster]	11m 32s
Win32	13m 36s
Win64	30m 6s
i386 Linux [GOAL install] [focal]	11m 51s
x86_64 Linux [GOAL install] [GUI] [focal] [no depends]	15m 18s
x86_64 Linux [GOAL install] [GUI] [bionic] [no depends]	14m 43s
macOS 10.14 [GOAL deploy] [GUI] [no tests] [focal]	28m 29s
	2h 18m 5s

Provide feedback