@chhitz please merge when it's convenient:
I would suggest to do the fix and not merge it to testing right now