commit merge from svn assambla