#13993: merge with 3.2.