#15920: merge with 3.2.