Merge from EFF