I'll look to push this to extras-testing at the end of the week, so please let me know if you find any issues before then.