#17364: merge with 3.2.