fix migrator and create upgrade handler (#1454)

fix migrator and create upgrade handler (#1454) #666