[MIG] Translated changes from 7.0 branch

After the PEP8 fix. Also a new module for 7.0 lands in `__unported__` dir.
Don't need this addition