Merge "Repeat the resync for submodule ids"