Merge branch 'sb/submodule-abort-update-upon-config-failure'