Integrate my changes of the last week.