Merge branch 'nm/maint-conflicted-submodule-entries' into maint