Merge "Move HistoricalInfo to property and use it in *Property."