Merge remote-tracking branch 'upstream/2.4' into 2.5 #3740

Job	Run time
Ubuntu 22.04	40m 6s
macOS 12 x64	38m 21s
macOS 12 arm64	51m 1s
Windows 2019 (MSVC)	21m 4s
Update manifest file on download server	0s
	2h 30m 32s

Provide feedback