I have started working on this & hopefully by today i could have a PR ready. In the meantime, would it be possible to get this ticket assigned to me. I tried, but looks like i dont have permissions.