Update: Kirill just started working on this...

Right now, it's a low priority as there's plenty of time before the change over.

But, we should have the update done well before the change over.