Improve PEP8 compatibility
Merge remote-tracking branch 'origin/master' into improve-identity-migration