#17539: merge with 3.3.