Ok, I can update once #7186 gets merged or you can close this and include it there.