Main

Merge pull request #7849 from drew2a/fix/7753 #381

Job	Run time
pytest / run (windows-latest)	7m 42s
coverage / generate and upload	3m 29s
docker / build	2m 12s
pytest / run (macos-latest)	3m 31s
ubuntu / build	11m 20s
pytest / run (ubuntu-latest)	3m 9s
	31m 23s

Provide feedback