Merge branch 'mesa_7_7_branch'