Changes to correct beacon history stall (WIP 3) #1835

Job	Run time
Lint	44s
ARM [GOAL install] [buster]	11m 45s
macOS 12 native [GOAL install] [GUI] [no depends]	10m 11s
Win32	13m 42s
Win64	32m 17s
i386 Linux [GOAL install] [focal]	12m 3s
x86_64 Linux [GOAL install] [GUI] [focal] [no depends]	16m 1s
x86_64 Linux [GOAL install] [GUI] [bionic] [no depends]	15m 54s
macOS 10.14 [GOAL deploy] [GUI] [no tests] [focal]	28m 35s
	2h 21m 12s

Provide feedback