Fix #19834: merge with 3.3.