Before continueing discussion, I tried this patch on the currenthead.
This patch applies cleanly except one hunk because of amodification just AFTER it, which did no harm. Finally allregression tests suceeded.
Attached is the rebased patch of v11 up to the current master.
-- Kyotaro HoriguchiNTT Open Source Software Center