#6698: merge with 3.3.