As we agreed we are going to land as it is for not blocking dev-branch. @rwldrn Could you take a look at this for fixing asap? Thanks!