CB-8168 Add support for --list