Bugfixes and docstring changes
on-merge: backport to v3.10.x
Try a different search query. Learn more about searching and filtering issues and pull requests.