#14283: merge with 3.2