Fixed migrations
Merge tag 'keep'
Merge branch 'master' into HEAD