Patch applied as adb1d5387bf46b37bfcf70f88b2352bef671bc92 with some
modifications.
Thanks.