Data migration 773

Also addresses #794.