Used svn export of cb trunk SVN 9634 to revert many changes and update to SVN 9634.