Fix logic
Fix white-space issue
Merge pull request #12410 from s0undt3ch/hotfix/jenkins

Lint fixes