Patch applied as cad8feef65d190962fa7fc2d76e4d5c9136cd0c0 with some
modifications.
Thanks.