1634 - Suganthi - Merging histories while updating