16 Commits (feat/connect-improvements)