[IMP] flake8 cleanup
Merge branch '7.0'