#17585: merge with 3.3.