Hopefully this will get added with the rest of the optimisations they are working on.