#13076: merge with 3.2.