Merge branch 'stable-3.5' into stable-3.6

* stable-3.5:
  Replicate first commit tree objects

Change-Id: I19a268f2ece45727a262f261017cef0baa31d1b3