More work on the migration script.
Merge remote-tracking branch 'origin/dev' into dev