#8913: merge with 3.3.