merge of initializer changes