[IMP] flake8
Merge branch '7.0'