There is a significant internal refactoring planned that should not impact the current API. However there are also other new features and updates that we should aim to support, see #25332 and #25333.