merge of cobra-devel with git/master