#8900: merge with 3.3.