Merge branch 'nm/pull-submodule-recurse-config' into next