Patch pushed as 9dbbf4ba48e5fa416261b3010567064d04d106c6 with a few
modifications.
Thanks.