#22092: merge with 3.4.