Refactoring RDBMS connectivity
Refactoring RDBMS connectivity
manuallly merging refactoring connectivity changes from master