Compound commands fix.
Lint
Merge pull request #10267 from cachedout/#9746

Compound commands partial fix