#17425: merge 3.3