@ Gyorgy Sarvari  :

Good Morning .
Please do consider this patch for merge in Kirkstone 
If any suggestion / feedback on this , feel free to share .
Will work on it accordingly

Have shared the 3 patch changes for same 

 

Thanks ,
Ashish