#11420: merge with 3.3.