Merging upstream PR10 and some follow-up cleanup into release repo