Merge work back upstream