Merge "Move HistoryBlob classes to own files"