Migration catch up (bug 999119)