Merge branch 'sb/submodule-update-try-harder'