Merge "Use actual rather than relative date"