merge from eclair