merged upstream/master in following upstream's merge of original CLI implementation