#17881: merge with 3.3.