porting over Daniel N.'s migration correction

Merge request reports

Loading