Merge branch 'os/commit-submodule-ignore'