Refactoring connection function
Unique namespace handling
Merge commit 'ffedd384b91e0fd423b4fe998b5c4100cad120d2'