EPD-34: Moved history to common