Fix legacy_id issue on migration (I think).
Merge branch 'master' into gsa