Merge branch 'stable-3.3' into stable-3.4

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

Release-Notes: skip
Change-Id: Ide5a2a4b7bf3f61bb875d61fd8436087e674c8f8