Merge of dev branch