Merge branch 'nm/submodule-update-force' into next