Patch pushed as 8aa104752cb6a61f2ac689c31ac627ccab32f7fe with a few
modifications.
Thanks.