Merge branch 'stable-3.6' into stable-3.7

* stable-3.6:
  Replicate first commit tree objects

Change-Id: I04dacd5967447c97aaac121e67d8758146137fdf