Merged with my cm branch.