Merge migrations, update synergy branch to develop