manual merge from branch 6.1.x to ie8 branch