Issue #20387: Merge test and patch from 3.4.4