#17198: merge with 3.3.