#19227: merge with 3.3