I have merged both patches and tha would works great.
patch created at Coworks