Eric branch merged.