Merge migrations, update synergy branch to develop

Merge with develop.
Merge migrations in discovery into 0035.