July 2 additions from upstream