Patch pushed as 8768df2ec03fc67e2acbc33b61fabc412fd75e0b with some
modifications.
Thanks.