Merge branch 'migration' into 'Milestone-3'

Updated migration to match final state

See merge request !66