Agreed. Should keep out of v3.0 and add to v3.1 and identify as v3.1 only.