#4153: merge with 3.2.