Patch pushed as a6d6a48b15d1303a31f9a5ea9fe4d28ac294dd86 with some minor
modifications. Thanks.