#15949, #15899: merge with 3.2.