#7855: merge with 3.3.