Updated patch attached. I reordered the patch series a bit also, will
post the entire series once this patch looks good enough

/Tomas