Merge of ref version