#17249: merge with 3.2.