Patches applied as 6d9a82a6fb8675441d63ae23b715952df13a845f and
following with some minor fixes.
Thanks.