#19238: merge with 3.3.