#16549: merge with 3.3.