merge from gadicohen