Brings in most of the changes from the past ~1.5 years, except those
totally unrelated.