Merge "CLI: Address multiple issues."