Merge current main into the feature/http-1.x branch
#4281
Merged
main into the feature/http-1.x branch
#4281