#16760: merge with 3.2.