Merge branch 'so/submodule-no-update-first-time' into next