#14461: merge with 3.2.