#10741: merge with 3.2