Fixed problem with potential connection leak in DataSource.
Merge branch 'master' into finder-controller-refactoring

* master:
  Fixed problem with potential connection leak in DataSource.