manual merge of 2.7 beta