Merge "Begin switch over to task based history."