#16210: merge with 3.3.