Merge "Add more debugging to cmd."