#16523: merge with 3.3.