Patch pushed as f35c9fd52116bf06e8200dfdade13b94659d217a with some
modifications.
Thanks.