#16127: merge with 3.3.