[COMMIT] carbon2: Merge Andrew Choi's patches since the carbon2 branch was started