Patch applied as b3919445432f35d779d342fcd63f5ca8ca757234 with some
modifications.
Thanks.