Merge changes from the past 3 years.