Include latest changes from Chris.