Merge of dev