#15831: merge with 3.2