[PATCH v4 0/5] Improve robustness of migration