#19480: merge with 3.3.