#11112: merge with 3.2.