Merge to allegro develop branch + change to migration script