manual merge of Master