Merge branch 'b2.6'