Rollback 2.6 RC#1