issue #20527: Backport fix.