Merge branch 'stable-3.2' into stable-3.3

* stable-3.2:
  Detect DelegateRepository in GarbageCollection operation
  Allow reuse of DelegateRepository functionality

Release-Notes: skip
Change-Id: I1da2532d1d45b7bf3af0dddea821168eb897cd04