#4965: merge with 3.3.