Merge branch 'nd/indent-fix-connect-c'