The current aim is to get everything merged by the end of the calendar year. Some pieces might come sooner than others depending on complexity of the project, remaining TODOs, and staff availability given we're also pushing hard on the iOS version right now.