Merge of new Collections code.