Merge "Fix migration bug" into mainline-prod