#21704: merge with 3.4.