Hopefully the pending work will make it for the upcoming release. The plan is to get this stabilised as soon as possible.