C1 essam fix migration resume

Please Merge with the master
@sarah-fathallah