Merge branch 'mv/format-cc'