#16978: merge with 3.2.