#16245: merge with 3.3.