#17938: merge with 3.3.