Is this particular issue resolved? Facing the same issue