#22568: merge with 3.4