#20135: merge with 3.4.