Merge from jmandel