Merging migration branch to master