This touches roughly 195 classes. I'm almost done with it. I have 26 tests left to resolve presumably the parameterized tests as that is all gradle showed me as failing. Expect to have over in next day or two for inclusion to 4.8.0 release stream.