Issue #30 - Updating to 2.7

Changing the basecommit as MDL-42447 got integrated.