#19319: merge with 3.3.