Merge branch 'hotfix/fix_asset_compilation_error_2'
Cleaned up migrations
Merge branch 'hotfix/fix_migration_error' into develop