Merge branch 'nd/submodule-status-fix'