Yes/no. That is the thing I'm trying to raise: Adding/merging the current state now, would mean that we merge something that will have a known migration, deprecation and breaking change up ahead in the near future.    I'm not 100% sure about the state of it right now. @MartinHjelmare is more aware of that part right now I guess, maybe he can clarify that.