Thanks Dan, I know you are trying to help me with other options, but we already considered those options. As Lingesh mentioned in the PR message, this is happening in more CF services now with moving to JWT and it's sort of blocking the basic functionalities; so it's much better to have it in main repo :)

Thanks a lot Lingesh for making the PR, I'll follow that and use it whenever it's merged :)

Best,
Sajjad