Milstone 2.6
Merge