Merge branch 'sb/test-submodule-update-config'