I think that might solve our issue, but that's @danielcebrian territory. Daniel do you know if having the version from #2588 will be okay for us?