sailus: if you still want me to split the patch, let me know. Otherwise, I appreciate if you could review it :-)
I intend to merge today those very last patches for the merge window