Merge pull request #8237 from s0undt3ch/develop

Some minor fixes
Fix pylint