SONAR-5233 Speed up migration