validated on 3.12 branch and applied in backport of #10448; this
brings the fixes up to `master`

(cherry picked from commit 8e076b6e)