Version history 2.7.0.0
Merge 2.7.0.0 to master