#15438: merge with 3.2.