#20977: merge with 3.4.