#13899: merge with 3.2.