Issue #20160: Merged fix from 3.4.