Fix missed merge conflict on develop
Merge pull request #16604 from rallytime/pylint_fix

Fix missed merge conflict on develop