Merge of iteration 7 release