Merge branch 'nd/submodule-helper-incomplete-line-fix'