Probably not something to be done before this release, though