Merge version 2.7.0 into master