Modify migration and commit schema
Merge remote-tracking branch 'upstream/master'