Merge branch 'ml/connect-refactor'