#16337: merge with 3.3.