merge from cris