#22751: merge with 3.4.