manual merge of CoreProduct branch into ie8 branch