#17511: merge with 3.3.