Yes, in the next major version.