am 223b6b3b: Merge "Begin switch over to task based history."

* commit '223b6b3bfeb7cfa3e844abeb36c04ab5c8318446':
  Begin switch over to task based history.