#14179: merge with 3.2.