This is now implemented for the next release.