Track splitting 70 x for pullrequest

These fixes are needed for the validation to run, because of 7X and other recent improvements

Backport of #6244