trying to reset
fixed persistance issue with additional migrations
merged master after persistance issue