#19069: merge with 3.3.