Merge "[MS81] Support remove history before cutoff timestamp"