Migrated to 3.2 #5336

Also, Flake8ified
Merge branch 'release/3.0.1.0' into develop
Merge migration to 3.2
Merge branch 'release/3.2.0.1'