Merge pull request #1 from newohybat/master

Pull
errors
Merge pull request #2 from newohybat/master

xx
migration errors fix v1
Merge remote-tracking branch 'upstream/master'