[Patch] Re: [AC21.5] Xft merge to mainline