#17271: merge with 3.2.