#16306: merge with 3.2.