Hi Gyorgy 
 
Good Morning.
Would request to please consider this patch for merge.
If any feedback / suggestion , i can rework accordingly.
 
Thanks ,
Ashish