#17833: merge with 3.3