We can, though this PR won't go into 1.4 anyway, it's a feature & too late, so we can continue working on it if you're happy to.