#19238, #19289: merge with 3.3.