#16940: merge with 3.3.