Merge branch 'Release_2_7_branch'