#13613: merge with 3.2.