Merge of command line branch.