You want to merge this into the 7.0.0 branch, so you have to deprecate for 8.0