merge from sammy