#19981: merge with 3.3.