Thank you for the patch.

QA tried to apply but failed with git conflict.

May you,  please,  rebase on current master and send v2?

--

Oleg