partially bring the CLI interface back up to parity with master