#14405: merge with 3.2.