Cosmetic enhancements to CMD. Refs #6967
Merge branch 'feature/6967_cosmetic_CMD' into develop