Revise migration
Merge branch 'MH-616' into dev