Update with master on history page