Merge pull request #2717 from div72/upstream_3995c88e #2845

Job	Run time
Lint	49s
ARM [GOAL install] [buster]	11m 19s
macOS 12 native [GOAL install] [GUI] [no depends]	12m 19s
Win32	13m 18s
Win64	29m 47s
i386 Linux [GOAL install] [focal]	12m 9s
x86_64 Linux [GOAL install] [GUI] [focal] [no depends]	15m 13s
x86_64 Linux [GOAL install] [GUI] [bionic] [no depends]	14m 43s
macOS 10.14 [GOAL deploy] [GUI] [no tests] [focal]	28m 4s
	2h 17m 41s

Provide feedback