#17256: merge with 3.3.