Patch pushed as 865728dd52600c7aa29a87bf18cb02ddf453cdfc with some
modifications.
Thanks.