Merge branch 'carbon' into jb2