#15865: merge with 3.2.