Merge branch 'nd/submodule-unused-vars'