Since this has been nominated for a release, here is a backport to 1.34 of the upstream fix that's in 1.40.
Since this has been nominated for a release, here is a backport to 1.34 of the upstream fix that's in 1.40.