#16206: merge with 3.3.