Merge of pcmd and pcmd-client