rev to merge from trunk