#17351: merge with 3.2.