This solution sounds like a workaround. Did you manage to find actual solution to the problem? It seems like my team is facing the same issue.