Merge pull request #8969 from s0undt3ch/develop

Lint Fixes
In-line disable PyLint W0221