Merge installhistory fix