Merge branch 'main' into telemetry-retry #2196

Job	Run time
Create patch version number and push to test-pypi	57s
	57s

Provide feedback