#15752: merge with 3.2.