Main

Merge pull request #7853 from drew2a/fix/7817 #389

Job	Run time
pytest / run (windows-latest)	5m 54s
coverage / generate and upload	3m 12s
pytest / run (macos-latest)	5m 2s
ubuntu / build	5m 52s
pytest / run (ubuntu-latest)	2m 44s
docker / build	2m 12s
	24m 56s

Provide feedback