Merge branch 'main' into fix-jinja2-template · fidelity-contributions/open-telemetry-opentelemetry-python-contrib@43eeddd