#17802: merge with 3.3.