final fix for migrations
changes committed before merging data_set_model with master
merge commit between data_set_model and master