begin merge to svn codebase