#19006: merge with 3.5.