Patch applied as 677b70633850a6ba316014f6593324640a9ac8ed with some
modifications.
Thanks.