#23144: merge with 3.4.