Issue #18458: merge comments from 3.3