Added modifications for 2.6
2.6 modifications
2.6
Fix conflict