#13499: merge with 3.2.