Merge branch 'devel-2.7'