I cherry-picked #356 and #357 so we can get those bugfixes out. This diff is against 2.3.2, since the main branch already includes a bunch of breaking changes for 3.0. If we need to do more point releases for 2.x, we can use the release-2.x branch as a merge target.
I cherry-picked #356 and #357 so we can get those bugfixes out. This diff is against 2.3.2, since the
mainbranch already includes a bunch of breaking changes for 3.0. If we need to do more point releases for 2.x, we can use therelease-2.xbranch as a merge target.