Merging the feature branch migrations-from-cli in