#13387: merge with 3.2.