new migrations map
new rebuild operation
Merge branch 'origin/master'