Cosmetic enhancements to CMD. Refs #6967
Merge remote-tracking branch 'origin/feature/6967_cosmetic_CMD'