Issue #13889: Merge fix from 3.2.