#15979: merge with 3.3.