#16304: merge with 3.3.