> Can you please apply above changes on top of this patch? Or I can submit
> v2 with it.

Please send v2.