#14558: merge with 3.2.