Merge changes I39698d4d,I8c8b67a9 into tm-qpr-dev

* changes:
  [Sb refactor] Move active data repo to connections repo
  [Sb refactor] Address code comments