Main

Merge pull request #7848 from drew2a/fix/7823 #383

Job	Run time
docker / build	1m 43s
pytest / run (windows-latest)	6m 7s
pytest / run (macos-latest)	3m 31s
coverage / generate and upload	3m 49s
pytest / run (ubuntu-latest)	3m 26s
ubuntu / build	4m 7s
	22m 43s

Provide feedback