Merge pull request #1397 from bdring/Fix1385 #885

Job	Run time
tests (ubuntu-latest, tests)	35s
build (ubuntu-latest, noradio)	2m 0s
tests (macos-latest, tests)	47s
build (ubuntu-latest, wifi)	2m 20s
tests (windows-latest, tests_nosan)	1m 22s
build (ubuntu-latest, bt)	2m 9s
build (macos-latest, noradio)	2m 17s
build (macos-latest, wifi)	2m 37s
build (macos-latest, bt)	2m 2s
build (windows-latest, noradio)	4m 46s
build (windows-latest, wifi)	5m 23s
build (windows-latest, bt)	5m 1s
	31m 19s

Provide feedback