#17690: merge with 3.3.