#15788: merge with 3.2.