final merge from internal svn