Patch applied as 40dbae7fe4de91af4eb2dae2ee88e369de83698b with some
fixes.
Thanks.