Patch applied as 18c00bc437420b6cbaf0bad143484b2fd2fb78a3 with some
modifications.
Thanks.