Fix lint issues. Simplify options building logic.
Fix inline code related lint issues.
Merge pull request #9585 from s0undt3ch/develop

Lint Fixes