BS-9382: add a waituntil, maybe the error came from the fact that the
save actiosn was not finished