Merge branch 'sb/submodule-update-in-c'