#16886: merge with 3.2